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: 4ac0f1f7 am: b669840c

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



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