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