Merge "New SIMINFO DB columns for phone number" am: 303aa3d8ac am: 6570c710bc am: 81a34fe5d1

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

Change-Id: I1afab97b99fb7b8be48c617263155c96139c41b2