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