[automerger skipped] Merge changes from topic "b/242040055-sc-dev" into sc-qpr1-dev am: 28ad5af718 -s ours am: edc0a1810b -s ours am: 7670c6b817 -s ours am: 57ed5b88a7 -s ours

am skip reason: Merged-In Ia525f218a46f8bf7fff660cec0d6432f09fdf24d with SHA-1 8bf1ae31ee is already in history

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

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