[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L42100000956041116:N02800001288713842" into tm-qpr-dev am: 924207c4 -s ours am: 8cd62837 -s ours

am skip reason: Merged-In I8c938f8796345dc2eee6c8eff513b0f993bc8165 with SHA-1 7146e2cb is already in history

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



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