Merge "[Bouncer] Remove KeyguardBouncer.java" into tm-qpr-dev