Merge "Replace setCapability usage in Tethering"
am: ab9527a44b

Change-Id: I7f1d2365e6981bb3bae13e95deae926f50653c8b