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

Change-Id: I6f0ae86412eb174474d640c437e0b0b006507c00