Merge "AOD: Use keyguard screen rotation when dozing" into oc-dr1-dev