Merge "Add CarrierConfig to TelephonySubscriptionSnapshot" am: 59aeaf29c0

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

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