Merge "Snap for 8508768 from f1a355d8d023c84461ccfad84d22e7a4bd51bdee to androidx-navigation-release" into androidx-navigation-release