Merge "Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev am: ba16d61c91" am: 98792d616b am: 507654d6ae am: 310a56dcb0
am: 1c97094149

Change-Id: I41e1576bfb9e49089ba251ab7324f2aba872fcb1