Merge "Support "dumpsys connectivity tethering"" am: 7057a44e40 am: 06e6033327 am: ff8b93f815
am: 97c496a41d

Change-Id: I222bf3363de805dd21e1cd62c056a292a5bd9f90