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

Change-Id: I40ac5a58426e5c5141c9519ee4e009ce9de2704c