Merge "Replace setCapability usage in Tethering" am: ab9527a44b am: 751ff7535a

Change-Id: I4d71bd58f18f283318e039cbf56ef8be5ede7712