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