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

[automerger skipped] Merge "[Settings] Refactor Wifi Calling description text" into sc-v2-dev am: 05836450 -s ours am: 7fe06efc -s ours

am skip reason: Merged-In I60f339bf4adf50236d80176669a557c77f0d97ca with SHA-1 5de864ae is already in history

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

Change-Id: I16abb6fe7c029e2b750c84a9bf3dc00a35244be2