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