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

Change-Id: Ia889b93625bbe2ec24b634ac25ca72cb1b44a3de