am 35b570da: Merge "Fix upgrade from subId to iccId use in PhoneAccount id." into mnc-dev

* commit '35b570da0a12d56a6b436e583d02e067ac0e9399':
  Fix upgrade from subId to iccId use in PhoneAccount id.