[automerger skipped] Merge "New SIMINFO DB columns for phone number" am: f5aba1ce25 am: 7951bb611c am: e03571ebcd am: 721ed41cd1 -s ours

am skip reason: Merged-In Ibe6bc203002aa75693d497dee6c6e6ca16866890 with SHA-1 fa3a243d3b is already in history

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

Change-Id: I05a580f8f4a92d92ccd56eb11c77f5d75ee99692