[automerger skipped] Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1 am: 86320e5484 -s ours am: 8dfe7ea127 -s ours am: c120b09dcc -s ours am: aa9a93d737 -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: Ie2df3fcf9208d4d4ee3a289f21d0f7885d3b31a6
This commit is contained in: