[automerger skipped] Merge Android R am: fab6cd93c1 -s ours am: 2120829015 -s ours am: 23730ad163 -s ours am: ed8a777667 -s ours

am skip reason: Change-Id I5d7809cf7ab2c26f22ad34434bfd997baed6e327 with SHA-1 50568dd112 is in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/bundletool/+/1421785

Change-Id: I8e603414a385ddb54be8bcf75049509baebc5326