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