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

[automerger skipped] Merge "resolve merge conflicts of 342dc78a to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: ba224c24 -s ours

am skip reason: Merged-In I3dba7719ac4c4d178c9ec5265865961dbd0450f9 with SHA-1 4a2c962e is already in history

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

Change-Id: I2f95a23945abbd3168d4b145b30735b195a44a0d