Merge "Merge cherrypicks of ['android-review.googlesource.com/3603130'] into androidx-savedstate-release." into androidx-savedstate-release