Merge "VCN: Replace hidden API getCarrierConfigSubset(Context, int, String)" into main am: 49e9b4dd5e am: 204138d098

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

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