[automerger skipped] Merge "Removed to avoid calling the...

[automerger skipped] Merge "Removed to avoid calling the updateImsServiceConfig twice" am: 40c5e3a3 am: 5c9cc6ed am: 7d701331 am: 50800a92 -s ours

am skip reason: Merged-In I6f4a0ae4c9e8f3482d4849240ab28e1160239f51 with SHA-1 005acab4 is already in history

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

Change-Id: I175b0447bdd39e6481365373fbd949541bc4b6b6