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