[automerger skipped] Merge "resolve merge conflicts of...

[automerger skipped] Merge "resolve merge conflicts of 4172f20f to sc-v2-dev" into sc-v2-dev am: 8f6a8ec8 -s ours am: 0d726c84 -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/+/15303325

Change-Id: Id52176a059ffd5830f90d04f0b97e944fa66b5ac