Merge "Bouncer should dismiss if being tracked when face unlocked" into tm-d1-dev am: e12369e3

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



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