Merge "Fix the behavior of keyguard bouncer in a corner case" am: 6997660506
am: 576351dbb4

Change-Id: Iefd1d3ae5e8b1688c339a8b91bbbcf5de2131767