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

Change-Id: Ib88b17502c344314cb81d9c0167c2610e55d8313