[automerger skipped] Added a new network capability MMTEL am: fef52dae am:...

[automerger skipped] Added a new network capability MMTEL am: fef52dae am: 6d79c809 am: 69b76e62 -s ours am: ac656a67 -s ours am: 29abd053 -s ours

am skip reason: Merged-In I633a681c1c34ce6d28929c3e6acf16c711588adf with SHA-1 d59ecda5 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2033145

Change-Id: I526b551e1a2bab387dddb6598ad3d8e2e293d980