Merge "Don't delay bouncer if face + fp enrolled" into tm-d1-dev am:...

Merge "Don't delay bouncer if face + fp enrolled" into tm-d1-dev am: 48bcccef am: dfd270be am: 781826f5

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



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