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

[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master am: e688ad81 -s ours am: 929e9579 -s ours

am skip reason: Merged-In I0c52dad86c0e8d7442e659b2fad7a95ac610f774 with SHA-1 841a8024 is already in history

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



Change-Id: I4035bfb79b6fc64905f266bd80deb38685a724ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>