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