[automerger skipped] Dynamically changing MMTEL capability am: 9a5b5fc3 am:...

[automerger skipped] Dynamically changing MMTEL capability am: 9a5b5fc3 am: 6f102e77 -s ours am: a94af6bd -s ours am: c30bda0d -s ours

am skip reason: Merged-In I112651cecade8cd6bc8c184e66c5a2f54ab0137f with SHA-1 278ff47e is already in history

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



Change-Id: I189532085e566b0836840a0ca2275b07a3f138bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>