Merge changes from topic "am-b571d74e040a406aacd0437198b6e7a7" into main

* changes:
  [automerger skipped] Merge changes from topic "am-7f9e1d236a8144219830346f25fac553" into main am: 0b6e9067 -s ours am: e053b373 -s ours
  [automerger skipped] Merge "Fix Telecom CTS crashes when checking for emergency/voicemail number" into android15-tests-dev am: be9cebdb -s ours am: 5fdab135 -s ours am: f8755cf2 -s ours