Merge "Snap for 5616525 from 35a06c0c2e54d4a727739ea20e5a052e9abb9779 to androidx-versionedparcelable-release" into androidx-versionedparcelable-release