[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-b69fe037b606474b99ef4e4fb05bf2e6" into tm-qpr-dev am: a5b66286 -s ours am: 0cd62beb -s ours am: 987d49d5 -s ours am: 540df372 -s ours

am skip reason: Merged-In I3f59df865dc2dd13d4b9ac54bb2dacb7b23f0aa1 with SHA-1 6888543d is already in history

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



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