Merge change 5359 into donut

* changes:
  fix potential string index problems in PhoneNumberUtils.numberToCalledPartyBCDHelper