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