Merge "init: Allow non-root adbd to switch between TCP and USB modes"