Merge "New SIMINFO DB columns for phone number" am: f5aba1ce25 am: 7951bb611c

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1920740

Change-Id: Iab34505d3e2f88a74c3adf712435c0b3170095d7