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 am: 3e7978f0
Change-Id: I091f85a3ac0b85aa78b4683a0d3ffc8faa431376