am 6b1035b3: Merge "Avoid duplicate carrier config change bcast." into mnc-dev

* commit '6b1035b3c00d4b7da5bef61d7465f6b9d5cd8e89':
  Avoid duplicate carrier config change bcast.