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