Merge changes from topic "am-05919bdbb64a446f8ab9085d9d866eaf" into...

Merge changes from topic "am-05919bdbb64a446f8ab9085d9d866eaf" into tm-qpr-dev-plus-aosp am: 62116e96 -s ours

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

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



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