Merge "Store the SubscriptionId together with the Carrier UID" into main am: 9a5aaaccf6

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2956897

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