[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L08900000954891083:N79200001270491487" into sc-qpr1-dev am: bc599a04 am: 77373e03 -s ours am: bfa13c81 -s ours am: 68474f75 -s ours

am skip reason: Merged-In I22903414380b62051f514e43b93af992f45740b4 with SHA-1 6390b37a is already in history

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



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