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