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

Change-Id: Ib1f41df1200378191c0722a280939ccbde539920