Merge "Revert "Enable acs for hotspot channel selection""