[automerger skipped] Merge "Fixed IA APN was not set when SIM is re-inserted"...

[automerger skipped] Merge "Fixed IA APN was not set when SIM is re-inserted" am: 34d7b5dc am: 2e709f74 am: 246761f3 -s ours am: 5afef6fa -s ours am: 0b9668be -s ours

am skip reason: Merged-In Iae66017cdf8b1ca14f47728988c6743f6b927aab with SHA-1 83aac297 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2032671

Change-Id: I8db4f27e428e82f39617f61060c9fa3d2baf6d22