Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786380



Change-Id: I94fff068332a141de2e01849e9e0f05dc8bf5d3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>