Merge "Snap for 5353420 from 0be98884b3172bab387f8f6e926309d23e442b97 to androidx-navigation-release" into androidx-navigation-release