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