[automerger skipped] Merge "New SIMINFO DB columns for phone number" am:...

[automerger skipped] Merge "New SIMINFO DB columns for phone number" am: 303aa3d8 am: 6570c710 am: 81a34fe5 am: e86a936d -s ours

am skip reason: Merged-In I3c152147ebbb73cd8318323e82853ec4e0c88e38 with SHA-1 50b1bab0 is already in history

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

Change-Id: Ida4ad01570649138027e2d4796619cd4890f0843