[automerger skipped] Merge "resolve merge conflicts of c23b5da7 to sc-v2-dev-plus-aosp  [DO NOT MERGE]" into sc-v2-dev-plus-aosp am: 532b9653 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I233e489fc1ae03f0324fac258f58549581205c29