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