Merge changes from topic "am-09c050a5a5e2427ea9bfdd9f6a16e8e4" into...

Merge changes from topic "am-09c050a5a5e2427ea9bfdd9f6a16e8e4" into tm-d1-dev-plus-aosp am: 4240fa5b -s ours

am skip reason: Merged-In I5705ac7586cb73b7bc2bd60bb792d0a0a951ed74 with SHA-1 657becf1 is already in history

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



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