[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: 4455b0dc -s ours am: 777a7208 -s ours

am skip reason: Merged-In Ibcb32225098883b4098807da6468a539e1c41c0c with SHA-1 aa5fc6ec is already in history

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

Change-Id: I2be5f2bce9b00f61ce04c26be330e5bb9a366f4f