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

Change-Id: I93520896836e7dd22369c3cc754b6723e435c2ab