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

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

Change-Id: I4a3359e821d32b09459aa36cab4f114870cdbbba