[automerger skipped] Start using ASM6 in jarjar am: f5f35e26f7 am: b633f13f1b am: 0429a93299 am: 98fe5fb8fb am: 569afa9f7c am: 74fa38efb3 -s ours

am skip reason: Change-Id Ic2d29d0c1ff9cbad282f81a3c9e8ecc5ab6d731a with SHA-1 f5f35e26f7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jarjar/+/12470582

Change-Id: I47f35ba7539be440a4ba6473128f9b98505e58ed