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

Change-Id: I23f84362b8700ed27148348ff07b11fea3efad32