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