[automerger skipped] Merge "Add columns of allowed network type reasons at SIMINFO" am: 270846b61c am: 4a939b031b am: 93903fbf95 -s ours am: 7a77fd06b7 -s ours

am skip reason: Change-Id Ibf9342a092d5be95ae86e2dad85d3788257958d7 with SHA-1 748b5f4a57 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib25171e5bc0a4b019289ceb12fccce6d02f026f3