[automerger skipped] Merge "Update IMS MMTEL API impls to include NR tech types" am: 1a4bab6ab0 am: 3888e3d5a8 am: 7fd1926b5a -s ours

am skip reason: Merged-In Id6c8b034d48ea385df2fc3e293fd1e539c425b95 with SHA-1 0d79c5731a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1700246

Change-Id: Ib21df3893a03638fb851260326523b47056d4ded