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

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

Change-Id: I7e307a191a8bd446f5db0bbcbf9fa6a418ef558d