[automerger skipped] Merge "RESTRICT AUTOMERGE Remove ScrimController from BiometricUnlockController" into tm-qpr-dev am: d411dd57f3 am: a9ff417081 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20691779 Change-Id: Ib78fa21e8e24cc18a65d7b89d4b0c8b6a7e785cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: