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

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

Change-Id: I46bc58714611c899c6e43b3b264c7ab5a270b04e