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