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

[automerger skipped] Merge "resolve merge conflicts of 23d24d1e to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: 553c4b78 -s ours

am skip reason: Merged-In I37a423f31ae80963147758160ac0234ae17469f9 with SHA-1 7b5e2982 is already in history

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

Change-Id: Id8349142a7f0729ff17983db7447bac1ad875403