Merge "Convert IControlsTethering from interface into callback"
am: 5b9d362b60

Change-Id: I911548e994761778cf5434b2513d433eeaccd4f3