Merge "Snap for 12227835 from 906d48c5bd0a1fcd319d0e6705dcd7b8d0d64df5 to androidx-navigation-release" into androidx-navigation-release