Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev am: 49a16f0998
am: e49c3675fe

Change-Id: Id089375a5699ac1157fc5f445876fee558d7bc7e