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