am 32148644: Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev

* commit '321486444e6c4d7ee77f8981e9921b923308ced9':
  API change: SetOperatorBrandOverride should not take iccId as a param.