Merge "Partial revert "Wait for unlock to start jobs."" am: 214a74b728 am: 63013a442b am: 13ff1dd274 am: 493d6155ad

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

Change-Id: I4e6435a0e9bf2514c98efa65e7959bab1bc8bf31