[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: f87eca1c75 -s ours am: f08d2c71b5 -s ours

am skip reason: Merged-In Ibd5933cd1bd1b831e7eea5147eca3799faf0ad1a with SHA-1 7adce360a6 is already in history

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

Change-Id: I024beeadae9a5f6d1427736ca45429161da2db8e