Merge "Stop unnecessary tethering reconfigurations"
am: 8ad1c81b07

Change-Id: I261ae05664d620997d38ca40edaffd8ca11b308e