[automerger skipped] Merge "Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: 2f424aa82c -s ours

am skip reason: Merged-In I17a2225712e0571d80b940d16e891e0780b4c72e with SHA-1 08514c337d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/treble/+/16844197

Change-Id: I22ad800ea5aeb77ac612e26f51542cce7501479c