Merge "Fix some @hide usage in Tethering(Cont.)"
am: 6a95399667

Change-Id: I086c49cc9653162d157176bf44a8ce1651f699cb