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

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

Change-Id: Ib71b8874f06d1200b6c9155523ab30e1e3239c56