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