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

Change-Id: I51e9403a516bd2768ec79425cc979a1ffe9ef00c