[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L19300000956051124:N78200001288956413" into tm-qpr-dev am: 76395aec -s ours am: 7fea2d05 -s ours

am skip reason: Merged-In I9eed58b2e96ebaf33e557a42e83525a74a4697d8 with SHA-1 5a0ea79c is already in history

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



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