Merge "Fix SMS and Calls preference summary displays empty." into main am: 3bfb35c71e am: a72f3f4ecc

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

Change-Id: I5c8ba3dc44ebe526ffd02ffbb0ef3a830a08b7d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>