am a8ceba1c: Merge "Plus code handling  for non-NANP CDMA carrier" into lmp-dev

* commit 'a8ceba1cb610c2ce166d4cdcbdb6eaec08886aa9':
  Plus code handling  for non-NANP CDMA carrier