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

Change-Id: I4942226389cfb629ab2364c53f4adaaa830fc9ff