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