[automerger skipped] Merge changes from topic "am-1b27ce2a609945c2b46aba3bb47fd42c" into rvc-d1-dev-plus-aosp am: 96a825bce1 -s ours

am skip reason: Change-Id I4a16bd68367d69c08a8aa177f36a2fd0dd016d1d with SHA-1 5983b339ae is in history

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

Change-Id: Ic5ac18eed7dd52fcc70cab05268dd3cde480f83a