[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 27fa29e45b -s ours am: 7651ae5023 -s ours

am skip reason: Merged-In Ia1aa63b7495a82d72da0ca5a70e1bda473cedc91 with SHA-1 f0a54b2317 is already in history

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

Change-Id: Ie074a69ae36f00591be2c8d8fccb3c47b33567fa