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