am 6544d5a2: am dee1c5c9: Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev

* commit '6544d5a2a7089b6e76c0548cd9f63f9400ce1082':
  Add carrier config for specifying invalid characters.