Merge "init_kill_services_test: also reboot after" am: 25a96e44ca

Change-Id: I7e0a3f2a54328227bce20f8f5d523beedfd37cb9