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