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