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

Merge "Dynamically changing MMTEL capability" into tm-dev am: 48c5d5be am: a1693657 am: 950976d0 am: 362ed278

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



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