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