[automerger skipped] Merge "Populate recently added sim_mccmnc into...

[automerger skipped] Merge "Populate recently added sim_mccmnc into ActiveSubscriptionInfo." am: 27ccf3d8 am: 511a4915 -s ours am: afc0838d -s ours am: 6e5b5af1 -s ours am: 4fa53a40 -s ours

am skip reason: Change-Id I06fa7edcc0099fa4e2335eca358261f7273b03c1 with SHA-1 b73ea9df is in history

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

Change-Id: Ie7d0f31f5b0b105cca765da7ef054876292864c3