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