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

Change-Id: Iece0a3dd1f997b4848095a68ea4dc968966e4e70