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

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

am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 468dd54e is already in history

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



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