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

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

Change-Id: I90af70727b1b60d542d703e139a80ff5a84c504a