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

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

Change-Id: Ia1462b70390b6e4ecd00641fe3da3d6f4604c1f9