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