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

Merge changes from topic "am-a8b3e93bf0464294b7753ce480f9b8c2" into tm-qpr-dev-plus-aosp am: ea7380ba -s ours

am skip reason: Merged-In I76208722bbb7a407ba1f2dc4305a28226166414d with SHA-1 c97296e9 is already in history

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



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