Merge "Support "dumpsys connectivity tethering"" am: 6cdcba7b48 am: 06e6033327
am: ff8b93f815

Change-Id: I68ff0810e4109c52e1d594a4b75fc768570ef59d