Merge "Stop unnecessary tethering reconfigurations" am: 8ad1c81b07
am: 009d42ffe0

Change-Id: I000020b5e1bca50b39c627a64fe98e0fd6d80b9e