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