Merge changes from topic "am-954a030309c64978b41606db6164aed0" into...

Merge changes from topic "am-954a030309c64978b41606db6164aed0" into tm-d1-dev-plus-aosp am: 34f2e6aa -s ours

am skip reason: Merged-In I486398111106b1a9551fb29f92ba7b4fe85f68c1 with SHA-1 a7ec0cbe is already in history

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



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