Merge "Snap for 7007133 from 513926fc07f451c58e0c346a9c214018eca858fd to androidx-savedstate-release" into androidx-savedstate-release