Merge "Deprecate the use of FULL and SCAN_ONLY wifi locks"