Merge changes from topic "am-6f00d3890c6548cb976df6ad5b8078e6" into...

Merge changes from topic "am-6f00d3890c6548cb976df6ad5b8078e6" into tm-qpr-dev-plus-aosp am: e150580b -s ours

am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f1 is already in history

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



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