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

Change-Id: I5cf79a8ea19cd84a7115f1e6b351f3415dcd155c