Merge "init: allow customizable restart and timeout periods for services"
am: 5f2a21d244

Change-Id: If6a54f0c4f673f995d6e79a9c671fb70ee18b438