Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18232666 Change-Id: I71658ad58b593f6cbadaf8148cb5c6859ac7151b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>