Merge changes from topic "am-3c36ffd229534905a8da89295119690f" into...

Merge changes from topic "am-3c36ffd229534905a8da89295119690f" into tm-d1-dev-plus-aosp am: d37c0a31 -s ours

am skip reason: Merged-In I3f59df865dc2dd13d4b9ac54bb2dacb7b23f0aa1 with SHA-1 bcebd3e9 is already in history

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



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