Merge changes from topic "am-9a5080bacdbd4185a6e238021611a04c" into...

Merge changes from topic "am-9a5080bacdbd4185a6e238021611a04c" into tm-d1-dev-plus-aosp am: 1aa67c17 -s ours

am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc6208 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19943344



Change-Id: Id7b3ead4752dbd91328ec4be1da599d2c94210bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>