Merge "RESTRICT AUTOMERGE Remove ScrimController from BiometricUnlockController" into tm-qpr-dev am: d411dd57

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



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