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

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

am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 7c38394a is already in history

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



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