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

Merge changes from topic "am-a7b90c06052843cb9505570dae1e5129" into tm-d1-dev-plus-aosp am: d87e5286 -s ours

am skip reason: Merged-In I76208722bbb7a407ba1f2dc4305a28226166414d with SHA-1 88e98e0a is already in history

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



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