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

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

Change-Id: Icd786cf3714b138594eabe0220a4cc65ed7565c2