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