[automerger skipped] Merge "Update subscription before broadcasting carrier config changed event" am: 1fa0134d34 am: 3228d43e4f am: b6d2007d05 -s ours

am skip reason: Merged-In I07e20291ba17966640776d1d0fb9c55f4eb4cbd0 with SHA-1 e37dd263c2 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2519537

Change-Id: I77fc4c26f31966493242320b4b7eb925c4752d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>