[automerger skipped] Merge "[Settings] Sync summary of call preference with dialer" am: 35f53d7fbd
am: 4b755362e6
-s ours am: cce627f7a7
-s ours
am skip reason: Change-Id Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8 with SHA-1 e17e302c9e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390856
Change-Id: I90c98f6131f2f5f597c1982a30f10f1c7b4b7f26
This commit is contained in: