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

[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 3010764a -s ours am: 059bc47a -s ours am: f79c3620 -s ours

am skip reason: Merged-In Icec03f01321c64d95d0bf1487ee9a1f4ae10529f with SHA-1 3aebb8c2 is already in history

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

Change-Id: Ib95172f575d481bc355038395fd18ba997fa8a38