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: fa2e75b5 am: 6f684c76

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



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