Merge "Fix a bug that job might not be able to be started properly." am: c8c2db4db6 am: d46f1bf46a am: 5d51e2905e am: 193fe3bc48

Original change: https://android-review.googlesource.com/c/platform/development/+/1773226

Change-Id: I52fe2467a332b0e12fa9f498cd0ff88ea5febade