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