Merge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev am: 29119b6f5f
am: 21929b83ac

Change-Id: I3a6c265dedfd33c0706bcad9ed12d3a2b9e3ba1d