Merge "KeyguardStatusBar: Fix bad state after canceled animation" into nyc-mr1-dev
am: cbed5a74a4

Change-Id: I82ed07990a4bdf635594a544881e560579f907c1