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

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