[automerger skipped] Merge "[Settings] Refactor Wifi Calling description text" into sc-v2-dev am: 05836450f9
-s ours
am skip reason: Merged-In I60f339bf4adf50236d80176669a557c77f0d97ca with SHA-1 5de864ae93
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16376597
Change-Id: I0f7920647fa91ff0bf49ce3f4e4133e5d0e72645
This commit is contained in: