Merge "Setting ASM to version 7 in sdkparcelables" am: e0029a5a87 am: 3a0e798ed9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946689

Change-Id: I4cb9b88255dd582c73be2dfcfdfc7f232110c2ab