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

Change-Id: I9939dff0d3341ef69cb38494f4e3cecc5dc3b3d8