[automerger skipped] Stamp refactorings am: 9f0e49e0a5 am: 6442eefea4 am: e72a9073fb am: 46254d151c -s ours

am skip reason: Change-Id Ib04f1852c8acea6c013402facbc73b1325e026d1 with SHA-1 9f0e49e0a5 is in history

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

Change-Id: Ic320ef063ec8d9852995cf612e6473b751792149