Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev
am: cbab3edc3e

Change-Id: I49d8dc5f8cdd470064c9450e6722a905a4d1b0ed