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

Change-Id: I1882f7e73325c4b938f22b2f7e29d203117819b9