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

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



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