Merge changes I16f94ee3,I071fdb62 into main

* changes:
  Fixed eSIM activation failed issue
  Fixed incorrect phone number from inactive subscription