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

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

Change-Id: I680586e6f84e5fc22a58a5c749e8d16ad0f79681