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