Merge "Partial revert "Wait for unlock to start jobs."" am: 214a74b728

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

Change-Id: I7a7edfc0e461268dc7c25f504dc674100aeb8e9b