[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 1023c783 to sc-v2-dev-plus-aosp am: b4523a71 -s ours

am skip reason: Merged-In I621ea06984f17954e9be138e9e5669aeb3cfb3fe with SHA-1 06e6eeb0 is already in history

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

Change-Id: I4cb39be10d43b32b1d114a7c26b4719dbebd1912