Merge "Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev am: ba16d61c91 am: 9cf74ade23" into oc-dr1-dev-plus-aosp