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