Merge "Snap for 5754798 from 35600966a2ba2a3b8c1b311066113dbf95733638 to androidx-versionedparcelable-release" into androidx-versionedparcelable-release