Merge "Fix some @hide usage in Tethering" am: b763432e14 am: aff6974b16

Change-Id: Ie88cd6ef541d5bd9fcec2e26c03277c75919a1a0