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