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