Merge "Update hint action for canceling face auth in BP" into udc-d1-dev am: 04158cf768

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

Change-Id: I0c66b8824829356b80165753e92779dcfe335dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>