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