[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 95d9d77e3f -s ours am: debebe4065 -s ours am: b0bc918e24 -s ours

am skip reason: Merged-In I91d34abdd7a84053aa4dc0c16d32b0ffcaa75619 with SHA-1 4ec4185b02 is already in history

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

Change-Id: If7fad35981fa2a3b8986e3ade0e3ab480399ba56