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