Merge "Merge "Ensure we update the navigation mode when switching users" into...
Merge "Merge "Ensure we update the navigation mode when switching users" into rvc-dev am: 2e0fd15e am: de237eab" into rvc-d1-dev-plus-aosp am: 0ceab30a
Change-Id: I36c9e40a0e0bb60804b16accbbbb9efdb9788b26