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