[automerger skipped] Merge "Persist the setting parameter in ImsPhone" am:...

[automerger skipped] Merge "Persist the setting parameter in ImsPhone" am: 61ded6f5 am: 9cb93d20 am: c5cb81ea -s ours

am skip reason: Change-Id I84ae1c8b480490bf472d1b595b429bf0f7bcd349 with SHA-1 f237f57b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c1be864fcac191bd19cefde2fb6abd83daa0be2