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

Change-Id: I94fc3652055c3ddbeb807c88b70d7fc833d69c3b