am 1c6fdd6c: am cac2fd30: Merge "Revert "Use a build-specific wifi country code"" into klp-dev

* commit '1c6fdd6c7b58b7f25d49fd26a29a03a478cc5937':
  Revert "Use a build-specific wifi country code"