am ab6939cc: am 6637c564: Merge "Add carrier config test to test_defs." into mnc-dev

* commit 'ab6939cc07275d372ac1e579a6f9fc37e50d9094':
  Add carrier config test to test_defs.