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

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