Merge "init_kill_services_test: don't always try to kill hwservicemanager" into main