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

Change-Id: I265c53deeb8c756c1480d45d50e0dcb98aa0c250