Merge "Stop face auth if occluding app doesn't want face auth." into...

Merge "Stop face auth if occluding app doesn't want face auth." into tm-qpr-dev am: e43723b8 am: 423bdcf9

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



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