Merge "Removed dividers from Phone Settings (2/2) redo" into tm-dev am: 209788d466 am: 10d656258e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/17573625

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