am 80c023db: Merge "Revert "Revert "mako: disable DFS scan, enable country code from SIM""" into jb-mr2-dev

* commit '80c023dbe22efc39d5b6edef4b9234bb74b18f9d':
  Revert "Revert "mako: disable DFS scan, enable country code from SIM""