Merge "USB: [Tethering mainline] Expose @hide APIs to @SystemApi" am: d997a3571b am: 62a34ebc11

Change-Id: I9578c3d1b30c1c747b88a146a691f3280f448039