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

Change-Id: Id1ccb6111a5688d464d359dabae7566d70d672a6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
4 files changed