am 4fba9109: am 58db3418: Merge "Show regulatory info based on hardware sku in Settings app." into klp-dev

* commit '4fba910955f54616baf462646bcc21e762d197d1':
  Show regulatory info based on hardware sku in Settings app.