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