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

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

Change-Id: I7d91c3f6a1bfffb6ec102d77d28992a539bbd67a