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

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

Change-Id: Ice2b529d02ec3889c0728e41c5e1829453bab475