Merge "VCN: Replace hidden API getCarrierConfigSubset(Context, int, String)" into main