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