[automerger skipped] Merge "Supported network capability MMTEL" am: d7a9d2f2 am: 365d0e50 am: 0e3c16a1 -s ours am: d24f590b -s ours am: f6e505d7 -s ours

am skip reason: Merged-In I845029fb68ce013d252fa6ffd59c868c9157ef92 with SHA-1 d4294156 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2034526

Change-Id: I622c5bb537a469d524a60a077cbbe20c889a9bc0