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

Change-Id: I5deca2c8224d629eadc18a7f7742c6f8d43b133d