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