[automerger skipped] Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1 am: 86320e5484 -s ours
am skip reason: Change-Id I68462368669b81e10d09bbb93e74e23ea9a1f446 with SHA-1 ced9489549 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1397828
Change-Id: I4320c9249fbbae470bb5b320cd9fde425a2c8828
This commit is contained in: