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