Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1

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

Change-Id: I8cec53b0c426cf73c470db0d763280d13435b257