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