[automerger skipped] Merge "Hide windows even when AOD is off" into pi-dev am: 5c75b5b60e
am: 4b6d16696f  -s ours

Change-Id: I61f9373e217095ad224415ad17cc1061d0fc8dbf