[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: 6e58e806 -s ours am: 32804cf7 -s ours am: 473317f1 -s ours am: a628fc9d -s ours

am skip reason: Merged-In Idfd099c87686e4ee3d19b2ee38606c62b1ad6522 with SHA-1 a6ce1759 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15571580

Change-Id: I40331175526dab36bc7f9c73e5b261391e11987c