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

Merge changes from topic "am-3a0f5f424d134071ada6a833ec758287" into tm-d1-dev-plus-aosp am: 18b6e5a2 -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: Ibe181838aba270f40f5ba6cd3283ce7a40733a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>