Merge "New SIMINFO DB columns for phone number" am: 303aa3d8ac

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1889878

Change-Id: I0279474acf0c3038a55b9bfd67f0bc410a75aba6