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