Merge "Dynamically changing MMTEL capability" into tm-dev am: 48c5d5be am:...

Merge "Dynamically changing MMTEL capability" into tm-dev am: 48c5d5be am: a1693657 am: ff3158d7 am: 370b4b39

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



Change-Id: I761aec47dfeb24ef9906cb590af17dff38db8520
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>