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

Merge changes from topic "am-a5bf379bbb554d03a6f985b9e40d85ee" into tm-qpr-dev-plus-aosp am: 825ef613 -s ours

am skip reason: Merged-In I109ea5b7703dbffd01b22ed1c8867a8c96b7c002 with SHA-1 8d48b7db is already in history

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



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