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

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

Change-Id: I55c1cd02960b6fae7dbea7c714b94b992f9d367b