Merge changes from topic "am-87c2453d25e74bff92c7c3706e892e87" into...

Merge changes from topic "am-87c2453d25e74bff92c7c3706e892e87" into tm-d1-dev-plus-aosp am: a249f98e -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/+/19941483



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