Merge "Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev am: 81e3b48f am: 7a1bc55d" into oc-mr1-dev-plus-aosp