Merge "Add bouncer state to KeyguardStateController; disable smartspace transition if bouncer is showing." into tm-dev