Run face detection if bypass is enabled and the user is already trusted. am:...

Run face detection if bypass is enabled and the user is already trusted. am: 12d35805 am: 6e2f72f5

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



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