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

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

Change-Id: Ia60d9f31c3a94dad04dea1bcac90e9966079436e