Merge "Merge "Partial revert "Wait for unlock to start jobs."" into...

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

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

Change-Id: Ia21333d131cc49f532770b3aca0611203514d21c