Merge commit '8db03c3c65c802eff9ada6c63e17f12c60b921e3' of sso://googleplex-android/platform/packages/apps/Car/SystemUI into HEAD
Change-Id: Ie60cdeac56329ecd5f65fd03c85fc9432ec3e952