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