[automerger skipped] Merge changes from topic "mmtel_vops" am: 09477d88 am:...

[automerger skipped] Merge changes from topic "mmtel_vops" am: 09477d88 am: 0da5a11f am: 47aaaef4 -s ours am: 972df60a -s ours am: 0d7c5526 -s ours

am skip reason: Merged-In I5013ec6b444334a3f362c85d4245af27d67cabd9 with SHA-1 88ff233c is already in history

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

Change-Id: Ia121ade251a715bde86745da58f03c0b382d3899