[automerger skipped] Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15dee am: 86320e54 -s ours am: 8dfe7ea1 -s ours

am skip reason: Change-Id I68462368669b81e10d09bbb93e74e23ea9a1f446 with SHA-1 ced94895 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1397828

Change-Id: I094d14db59d3bacd0dc84548034c6c4f6e6e20a5