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

Change-Id: I178130e65db4fef26d62ea7eaa9a52f7e8103432