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