Merge changes from topic "am-a1f3d04d02f9427794f322c5614d253f" into...

Merge changes from topic "am-a1f3d04d02f9427794f322c5614d253f" into tm-d1-dev-plus-aosp am: 9c5e0393 -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/+/19943345



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