Merge "Add APIs for Wifi/Cellular coex channel avoidance"