Merge "Show `swipe up to open` message on faceAuth from AOD2" into sc-qpr1-dev am: 0efdcfc86b

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

Change-Id: I8375fb41fc967772ddb9f71b996be59a57e90333