[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 6041a066200098daadd71a1e1fc313bfe0c7ddd8 to sc-dev-plus-aosp am: 8553bf42 -s ours

am skip reason: Merged-In Ia46dc4e50d42dbd574588b531045cb680aa09d94 with SHA-1 fe3d6da4 is already in history

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

Change-Id: I2b81c10b64efc6eb3933ccfb8b639ffe3dc9065e