Merge "ServiceManager signals init to start lazy services" am: 66050ee75e
am: 94ddc1694a

Change-Id: I9be47cfe686479e5998fadeb636646d6e7c2241d