Merge "AOD: Use keyguard screen rotation when dozing" into oc-dr1-dev am: c8c4056756
am: 5e8651c195

Change-Id: I6c5f319149f24bab978b30e42dc3aa1816501b90