Merge "Revert "Android: Handle Freq conflict in single channel concurrency case""