Merge "Revert "Migrates full screen user switcher to use CarUserManagerHelper instead of""