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

Change-Id: I2ea9ccbfe01cfa948fb6dc6012859fc43a5c284b