Merge "Don't display UI when playback state is STATE_NONE" into pi-car-dev
am: 3f8d61898a

Change-Id: I796a7c9a61d040fd77cffac25ee64e10c4deb3c7