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

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

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