Merge "Quicker exit animation for bottom dock on Keyguard" into nyc-mr1-dev
am: 1191fee634

Change-Id: I68e88e13d89e7184cbbeab9ced910a28b8deaba5