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

Merge changes from topic "am-e2bb2aacf9484c3eac5ee57d1e002586" into tm-d1-dev-plus-aosp am: c808f96d -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/+/19942600



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