Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9

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

Change-Id: I1797a32fe9037755a699c3d402d69d4d557c27c3