Merge "[Bouncer] Remove KeyguardBouncer.java"