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