Merge "Bouncer should dismiss if being tracked when face unlocked" into...

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

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



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