Merge "Upgrade ASM to 9.6" into main am: 61564d7dd2 am: 165010ae0c

Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/3128059

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