Merge cherrypicks of ['android-review.googlesource.com/2734817', 'android-review.googlesource.com/2743918'] into androidx-navigation-release.

Change-Id: Id63ac77abc25f542083ed4f5a81f12443d8b7062