[automerger skipped] Merge changes from topic "b/242040055-sc-dev" into...

[automerger skipped] Merge changes from topic "b/242040055-sc-dev" into sc-qpr1-dev am: 28ad5af7 -s ours am: edc0a181 -s ours am: 7670c6b8 -s ours

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

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



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