aml_tet_331511160 (9924753,com.google.android.tethering)
Snap for 9333799 from 30b8bcafb9050d202c0e1e263622a68bb1f789f2 to mainline-tethering-release

Change-Id: I7f2e8b2fa6b1fc9921e1dff3ab520d2c0a2498ee