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

Merge "Dynamically changing MMTEL capability" into tm-dev am: 48c5d5be am: 83260b09 am: a469aab4

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



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