Merge "AOD: Fix navbar flicker when launching assistant" into oc-dr1-dev
am: bd27fd7368

Change-Id: Ieb33f859cb1c190a23f08bd68b77c049ca9719b2