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

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

Change-Id: I48bad553fd360ab51329e70a9857683014690743