Merge "Add timeout when waiting to bind to JobService" into lmp-dev