Merge "Partial revert "Wait for unlock to start jobs."" into sc-qpr1-dev am:...

Merge "Partial revert "Wait for unlock to start jobs."" into sc-qpr1-dev am: 76849b6a am: 8d943ec2

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

Change-Id: I1160854d00bf567b9569f21a4b5a1f67971df466