[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 6041a066 to sc-dev-plus-aosp am: 14bb3b42 -s ours

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

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

Change-Id: I2b81c10b64efc6eb3933ccfb8b639ffe3dc9065e