Merge "Add CarrierConfig to TelephonySubscriptionSnapshot" am: 52415eb872 am: f04cf4f961 am: 70a235910e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2063410

Change-Id: I83b7473cc8358213b5ce87781cb534d9ebf79991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 7520e9fa1a6a194a45f7630997552cb640721fea
  1. Vcn/