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

Merge changes from topic "am-dc4cdda350c548b99cac15442f8c5235" into tm-d1-dev-plus-aosp am: 958fb332 -s ours

am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 b479180b is already in history

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



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