Merge "Notify ScrimController when unlock finishes, so we can update relevant...

Merge "Notify ScrimController when unlock finishes, so we can update relevant conditions." into udc-qpr-dev am: 9fb045d6

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



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