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