Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev am: f33b1eda88
am: fb8e9add4b

Change-Id: I01bf252c08decae7f82ce854332c3b4a342b5ee3