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

Change-Id: I71d3235402fd23ea82542bbb0957a7516ef77a66