Merge changes from topic "am-504daab2d2ae48e59a246ea145aefd02" into...

Merge changes from topic "am-504daab2d2ae48e59a246ea145aefd02" into tm-qpr-dev-plus-aosp am: 4a7ac364

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



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