Merge "Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev am: cbab3edc am: 0cd8a31c" into oc-mr1-dev-plus-aosp