Merge "SystemUI: Disable alternate nav bar in car mode" into nyc-mr1-dev am: 4091ecb7af
am: 2040cad020

Change-Id: I6087911d8e15cbdc4a7af139d05bd453d10fdf08