[automerger skipped] Merge "Add isActiveUnlockRunning" into udc-dev am:...

[automerger skipped] Merge "Add isActiveUnlockRunning" into udc-dev am: 1c5b765e am: 5c3633e3 -s ours

am skip reason: Merged-In Ibceac9d721190a4da3905e71d11c4424f7ee9676 with SHA-1 fd27baff is already in history

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



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