[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891"...

[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: 2ded1d00 -s ours am: b3c39122 -s ours

am skip reason: Merged-In I10fd54544bee940313f3987247c1841101a9d03a with SHA-1 f8ce875c is already in history

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

Change-Id: I092533a5a0fcff20ac9f125cf477204b2ec79a35