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

[automerger skipped] Merge "resolve merge conflicts of 0f8dfa53 to sc-v2-dev" into sc-v2-dev am: 24477a6d -s ours am: 38cf0b32 -s ours

am skip reason: Merged-In I07dbb58b234bee06c31a67fd38ab363ff13d9458 with SHA-1 0f8dfa53 is already in history

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

Change-Id: I1cfdd64d7d4533c2925535e47a9442b158310a37