[automerger skipped] Merge Android 12 am: fa2d97f73f -s ours am: bf51176f28 -s ours am: ac8b0779f9 -s ours

am skip reason: Merged-In I95928fddc96f3a90e2ae935e9ccd6229801471d1 with SHA-1 e290dbccf5 is already in history

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

Change-Id: I6b6ff21428c05e31a43805c025753c890b3965ff