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
am: 00cdda008d
Change-Id: I4bad37c4f8b43bc1f4af8d517b619dff6c4c6006
This commit is contained in: