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

Change-Id: I85e1c04253438685424c3f1fd3d7690425e9ffce