Migrate codebase to Navigation 3#1902

dturner wants to merge 8 commits intoandroid:mainandroid/nowinandroid:mainfrom

claraf3:cleanup-new-codeclaraf3/nowinandroid:cleanup-new-codeCopy head branch name to clipboard