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

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

Change-Id: I799b56e2bff31d0b3148e1368ba6c9085e62f790