Merge "init_kill_services_test: wait 120s for apexd"