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: Id58458b8523d74d70ee2a9a2ed93195949c8a253
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>