am 0018323c: Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev

* commit '0018323c07d119fde7260d66f60dd9987c7b74ea':
  Add carrier config variable to hide preferred network type