[automerger skipped] Merge "[Settings] Sync summary of call preference with...

[automerger skipped] Merge "[Settings] Sync summary of call preference with dialer" am: 35f53d7f am: 4b755362 -s ours am: cce627f7 -s ours am: 09071f7a -s ours am: 3e26a1e5 -s ours

am skip reason: Change-Id Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8 with SHA-1 e17e302c is in history

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

Change-Id: Ib719a98b255d06fe574106d9acee8997859106fb