Merge "Merge "Revert "Notify/bind app after the phone is unlocked"" into...

Merge "Merge "Revert "Notify/bind app after the phone is unlocked"" into udc-dev am: 9a6bb7ee am: 055cc7ca" into udc-d1-dev-plus-aosp am: 4445cc05

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



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