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

Change-Id: Ibd62f5942fd09e0c1ec846db0595c76d0ad822be