[automerger skipped] Merge "S V2 is now REL" into sc-v2-dev-plus-aosp am: 8702eff8 -s ours

am skip reason: Merged-In I5f94e458bf0c420341847a49242da20c9b4281e4 with SHA-1 d5a57335 is already in history

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

Change-Id: Ib800ddc3987dabe3108aaa9d576e1a9550f73888