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: 653e6d81 am: 17bd675f

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

Change-Id: Ia5d9f7bd5b917c9a5fb4df3243f93e712bf08c13