Merge "Snap for 11149604 from 8f6cec6ca74bbbaf4a728f9965f124ff5b87f08f to androidx-versionedparcelable-release" into androidx-versionedparcelable-release