Merge "Update subscription before broadcasting carrier config changed event" am: 1fa0134d34

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

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