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

Change-Id: Iad3fa37a7020319005b13566c71e55824fb31c07