aml_tet_331117000 (9323954,com.google.android.tethering)
Snap for 9021447 from 0527a813e16b764403d48ddd3f34c7647ab27e34 to mainline-tethering-release

Change-Id: I948234260c5597a301a9faa775adee94fb0308c8