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

Change-Id: I6c2dbc64ff1d8be113b5e226489e21c6e2afcb3a