[automerger skipped] Merge "resolve merge conflicts of c817fdc0 to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: d00eea13 -s ours

am skip reason: Merged-In Ibac2282d5c9242ae063adb2247d4297291fa3abf with SHA-1 c6f61ee9 is already in history

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

Change-Id: Ic947f55f9d1c8e85d2790048d9a4b0cc6173c8d2