Merge "init: add timing log for oneshot and exec_background services" am: 81e25f5e32 am: bdf354f0ae
am: b317dabbaa

Change-Id: I04beb89743baa418ef942c9d707cbe4a8c0362cc