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

Change-Id: I21064a3c20f440fb0cf244cd4ab981761573ec43