Merge "Remove hostapd.conf before starting Tethering am: dc24ed7ffb am: 5ab7f53cbd am: 26c98abafc" into oc-mr1-dev-plus-aosp