[automerger skipped] Merge "[Settings] Refactor Wifi Calling description text"...

[automerger skipped] Merge "[Settings] Refactor Wifi Calling description text" into sc-v2-dev-plus-aosp am: 5a36357d -s ours

am skip reason: Merged-In I60f339bf4adf50236d80176669a557c77f0d97ca with SHA-1 8a892271 is already in history

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

Change-Id: I33b3302bcae2d8d70fb9a0de05e487e40a1444f1