Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev am: 81e3b48f9c
am: e2f42b1c19

Change-Id: I942c8a5d429b678b4880fd03a464f57c2b963a09