[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L08900000954891083:N79200001270491487" into sc-mainline-prod am: a55c76e2 -s ours am: d40f030a -s ours am: b1b550ce -s ours

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

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



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