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