[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 2bac0b4304 -s ours

am skip reason: Merged-In Ife565ede7fe4b86c8c854fc62d4b042b777dd226 with SHA-1 03695dcf72 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/16845243

Change-Id: I5ada9236ac250805aeba983af5ef71de1b77aa9c