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

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

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