Merge "Fixed double face auth on swipe" into sc-dev am: 4438cf67 am: b9745dc6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301708

Change-Id: Iefb73c901cc57c999c7cea6e4daeec5355590c8a