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