Merge "Upgrade ASM to 9.6" into main am: 51865dd269 am: e0343a0e22

Original change: https://android-review.googlesource.com/c/platform/external/auto/+/3125094

Change-Id: I56b7179188709ee82b60dafd335be738a33d9daa
Signed-off-by: Automerger Merge Worker <[email protected]>