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

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

Change-Id: Ia97fc623290b246705bafb32e2d1579cd968bde9