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