Merge "Revamp USB tethering startup flow."
am: 90fddefd5e

Change-Id: Ica932756d19c7ac874ae822c9785e856dcf81db3